US17: Updating for US14 changes