added 2 signatures to make-handler