moved some of the locations