part3 updates
part3 final
Merge branch 'feature/part3' into develop