Resolve Paul's comments