Add S17 and S18.