Few changes, Comments etc.