re-ordered some locations