finally fixed orbiting (?!)