Adding ACORE changes
emotion halved
Merge pull request #2 from Yathi/master

Changes in backend code