finished syntax changes