Updated from click event to tap event