Update #11 30/31/25