modify handler