Updated for lunge and longswipe