cleaned up transitions