update cheshire.  hand-tested to work fine