John/optimize swipe