Changing event handling to make it less irratating