Chnaged event order to be level based