A few improvements, getting rid of orindarycallingformat call, doesn't work with newer s3 datacenters