finish request handling
add updated helpers