Added a new feature

#1 and removed default events :(