Added S2 support