- Move the code from my previous commit before signalling the user event