Further improve cart