Improved factory