Implement Sherry's comments, round 2