Changing to keyup trigger as well