Various changes based on McCann training