UPDATED final resolution for issue-1.