fixed events stuff by removing the user-level