Updates after Seb's feedback#5