Order events

Change events ordering (still to fully complete)