Fixing up transitions
Finalising transitions