'addEvent' parameter position changed!!!
 - code refactorings...