new version from sam@monet.berkeley.edu