Updates after EULCS w7 (super week #2)