added assignments
Merge branch 'main'