some comments and modification