Refactoring S2C6.