Update with Megan's changes