New version (actually, reversing to 0.7)