Trying to fix event stuff