Revise some methods