Even more syntax changes. Will need to bring these up with Dan and Paul on Monday morning.