Final edit for issue-11