changes after the comments