Reapply aurelie's changes