Rewrote substitution