Refine reference to S17 (hardly a draft anymore)