Added 'tap' event and included else statements