Made changes

https://app.asana.com/0/4829154706907/10641386370360
https://app.asana.com/0/4829154706907/10641386370355