some modifs after review