Updated Transistions, should work