Incorporated Paul's comments