Factories tweaked