minor changes
Merge branch 'working1' into master2
Fixed main branch