Modified issue-2