removed priority queue and move all details into EventQueue