Few changes from Josh's code and adding short tap of A to change modes