Putting country code back b/c Singapore is a city-state