put handler definitions back, dumb mistake