move events additions to correct locations