Added some transitions and stuff