Switched to string substitution