Continue S2

Added options 2 & 3 for S2.