Updated solver and connections