modify based on the comments