Fix goal to correctly incorporate exemptions