Fixed up stuff

Added a new custom event