updated plan from last weeks feedback
merge conflict