CHG: Added tap functionality