Added remaining functions to new solver
Performance improvements