Edited Catapult by switching where timers were