resolve review comments-2