fine tuning event creation flow

in progress