Continued new event and cleaned up code