Side Effect: Crashes - Revert

Due to major crashes, this is a revert to the previous version. I apologize.