FO: product adding optimized