Updates after NALCS w7 (super week #2)