Worked on agent view
Merge branch 'newbranch'