Corrected event firing behaviour
Added statement publish control
Added log in control