Add essential cloud-to-butt substitution