Added S17 & S15.
Added S22 & W17.