Updates after Seb's feedback#4