cleaned up, used magellan jump