revise handlers