Completed S2C9

Fixed S1C8 and completed S2C9.