Changed catapult back to Ryan's version