more syntactical changes