forgot a few substitutions