Changed the stupid safe stuff