Made changes to Catapult subsystem.