~ fixes after review 2