final changes before handoff