Updates based on comments