Updated selected methods
Changed eventlistener
Changed eventlistener