total transformation add Locations
merged changes