Updated s2w script again