Almost there. Some more syntax changes