Updates after Seb's feedback #2