Actually update handler[HANDLED]
Refactor off (again)