Changes from hatch's review.