Changes to address Paul's review comments