minor change
add handlers functions