updated to work with the products