Added more changes with new commit after talking with @pranavkm . Look OK ?