some edit on handlers