Trying to get consistency between local and live environments