#1572 - working on subproducts