add s1 validation for client/server