Updates as per Mary's request