Changes made.. event handlers separated