Removed SPACESHIP DISASTER safely with a few extra changes