Changes for future "Quick click as swipe"