WIP - hook existing event