v1.5 - S2 support