Optimised the event handler slightly when it comes to options