Switch to usinng "handler" instead of "fn"