Updated with custom product information
Fixing merge conflicts