last changes + comments