147eb9c Hugh revamp with *Factory.