Added changing location and minor changes