Changed location to two letter country code