updated EVERYTHING + put in gesture