Implement Mont's comments.