more events and added router