Factory pictures

odd-shape component handling