numerous syntax changes