Revise based on comments