Change after comment review