resolve Paul's review comments