Functional coding done and unit test added