Updated expresssions to match BJ's page 12, Figure 15