added all substitutions extraction