Cart made a bit better