Update changes based on comments