WIP - adjust control event