switched to cleaner events