6G Substitute
Merge pull request #1151 from Fuzzysqurl/substitute

6G Substitute