Fix s1c1
Finished s1c2