address Peter's review feedback