tried to fix orbiting issues, now splits into two