Solver change - now using scipy