commented some legacy code out. made sure that all substitutions were put
together