refactored all events to include time stamp