more work on intro + S2