Addressed feedbacks from #6, attached interdiff for same. please review