Updated master branch with Brenda's working code