More udpates for location #374