Updating some content based on some feedback from Mark and Leatta