Update after Shunt #2