already changing to 093b; needs testing
0.9.3 ready