ISSUE-#7 has been completed