Started working on location update