removed refactored events
latest code