New version for 0.94