Updated 'Solve' functionality