Add location to time
Merge