Changed the way Events works