Improve cart part 2