some more syntax changes