work-in-progress S1 & S2