added some changes with emily
fixed merge conflicts