Add improved resolution from Mike Spertus