Saving now working without location