last changes after review