change signature of handler to two arity