Change from r51 part 2