removed FACTORY class