Moar changes to this handler.  better and more awesome