Switch order of events stuff
And add some colour