master: 67f2e7a553848930bf5f32699802539ae68801b7 rest of the idea factory