Reverted a few updates due to crashing