v 0.31d; split cases into few separate classes, but now it's very broken