Fast substitution added