Test for moving and archiving locations
Minor changes