Events instantiation added to draw method
Removed unnecessary enter / upated, replaced by merge