Changing one hardcode to antoher before final cleanup.