Improved shopping cart. #13