Changed location and name