Modifications based on the review by Doug