last changes in 1.1