Updated pull request with Miriams merge