#3.2-last changes