timing
tidied up transitions slightly