added upload photo, set location