Implement Mont's comments on page 5 and 7.