modified push/pull - JEFIT