before modif following simon's talk