changes based on the comments