Now saving location too