Changes to use of solve() function