Updates after Seb's feedback #3