location structure and changes
Merge branch 'david'