Factory pictures

design for testability