ISSUE-#9 has been completed. Working with ISSUE-#10