code changes for locations...