even yet more syntax changes