Added more event handlers but they are broken