refractored orbit a little bit