Incorporates wording changes from Dave