Improved decorator. Worked on client view.