Updated pull request with Miriam's merge