Now using flapjack extension rather than a handler.