Changes made a fully tested
Merge branch 'backend-changes'