changed some locations