Revise some discussion