onTap Feature added