Updates after Seb's feedback