PUll request: Colombia controller changes