Unified the events a bit for the next steps