Implemented issue-2