Pull Request from Carrie after the recent updates