modifications product_id fixed