Updated SW modeling