Cart has been improved but it is not completed yet