Updated to embedded locations.