Changed the way the transform storing works