rename make-handler to handler