More registration goodness