Changing the listener so uses an event instead of invoking control in main form