Updated event handlers to have the original selector as this