Updated FEM solver