 #include "orthogonal.h"
 #include "dg/ds.h"
 
-//typedef dg::FieldAligned< solovev::ConformalRingGrid3d<dg::DVec> , dg::IDMatrix, dg::DVec> DFA;
-typedef dg::FieldAligned< solovev::OrthogonalRingGrid3d<dg::DVec> , dg::IDMatrix, dg::DVec> DFA;
+//typedef dg::FieldAligned< conformal::RingGrid3d<dg::DVec> , dg::IDMatrix, dg::DVec> DFA;
+typedef dg::FieldAligned< orthogonal::RingGrid3d<dg::DVec> , dg::IDMatrix, dg::DVec> DFA;
 
 int main( )
 {

        dg::DMatrix dx = dg::create::dx( g3d);
        dg::DMatrix dy = dg::create::dy( g3d);
        dg::DMatrix dz = dg::create::dz( g3d);
        dg::HVec hbx(function), hby(function);
        dg::geo::pushForwardPerp( bhatR, bhatZ, hbx, hby, g3d);
        const dg::DVec bx(hbx), by(hby);
        dg::blas2::symv( dx, lnB, derivative);

        const dg::DVec v3d = dg::create::inv_volume( g3d);

        std::cout << "Computing ds..." << std::endl;
        //DFA dsFA( conformal::Field( gp, g3d.x(), g3d.f_x()), g3d, rk4eps, dg::NoLimiter(), dg::DIR); 
        //dg::DS<DFA, dg::DMatrix, dg::DVec> ds( dsFA, conformal::Field(gp, g3d.x(), g3d.f_x()), dg::not_normed, dg::centered, false);
        DFA dsFA( orthogonal::Field( gp, g2d, g2d.f2_xy()), g3d, rk4eps, dg::NoLimiter(), dg::DIR); 
        dg::DS<DFA, dg::DMatrix, dg::DVec> ds( dsFA, orthogonal::Field(gp, g2d, g2d.f2_xy()), dg::not_normed, dg::centered, false);

        std::cout << "ds constructed!" << std::endl;
        dg::DVec function = dg::pullback( funcNEU, g3d), derivative(function), temp(function),
