added more changes
Merge branch 'backend'
merging changes