many syntax changes