Working on the handlers and CoR