added some more location code