Updated after Seb's feedback