Latest changes before handoff to Brent