Changes by both Garreth and me to get our local tree to work