new Snapshot includes patches from Taro L. Saito