Incorporates Rob's edits