Changes based on reivew