fix after review + the last changes