erasing more, before Pauline merges from this branch