user integration and factory fix