ERD updated & shopping cart being fixed