Fix factory to be AWESOME