Added explicit substitutions