Refactored - New Event Handlers Added