S2W patches part II