Updated Solve System Code