Fixing public methods (issues with changes to event handling)