Updates by Mott McDonald / NESPAK