last changes for 0.97