Fast substitution method added