Add a #define to switch between dof and non dof