Changed EventListener to routines