moving a few things around for substitution