added cargo solution