more syntax changes