Implement meebey's changes post-review.