Addressed #4 and created MR. Please review