Updated FEA, integration 2D and 3D