Updates after Seb's feedback#1