Updated last changes after review