Update based on comments