added functionality to data
Merge branch 'backend'