Updated to work with the new version of the cart