Refactored code to allow consistent changes other than orbits