Moved to the solve()