10.9 changes - thanks to hard work from Duncan Foster