cart mngt - fixes #6
merged conflict