Changed some  location trouble