added to implementation plan
more changes
Merge branch 'master' into develop