Updated with gestures