More revision according to mardi notes