new task : Changed the way events are registered
Merging