Move to the handler style, since I'm using it anyway