diff --git a/simpegEM/FDEM/FieldsFDEM.py b/simpegEM/FDEM/FieldsFDEM.py
index 129022ea..59754002 100644
--- a/simpegEM/FDEM/FieldsFDEM.py
+++ b/simpegEM/FDEM/FieldsFDEM.py
@@ -4,53 +4,14 @@ from simpegEM.Utils.EMUtils import omega
 
 class FieldsFDEM(Problem.Fields):
 	"""Fancy Field Storage for a FDEM survey."""
-	# knownFields = {'b': 'F', 'e': 'E', 'b_sec' : 'F', 'e_sec':'E' ,'j': 'F', 'h': 'E'} # TODO: a, phi
+	knownFields = {'b': 'F', 'e': 'E', 'b_sec' : 'F', 'e_sec':'E' ,'j': 'F', 'h': 'E'} # TODO: a, phi
 	dtype = complex
 
-	# def calcFields(self,sol,tx,fieldType):
-	# 	if fieldType == 'e':
-	# 		return self._e(sol,tx)
-	# 	elif fieldType == 'e_sec':
-	# 		return self._e_sec(sol,tx)
-	# 	elif fieldType == 'b':
-	# 		return self._b(sol,tx)
-	# 	elif fieldType == 'b_sec':
-	# 		return self._b_sec(sol,tx)
-	# 	else:
-	# 		raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType)
-
-	# def calcFieldsDeriv(self,sol,tx,fieldType,adjoint=False):
-	# 	if fieldType == 'e':
-	# 		return self._eDeriv(sol,tx,adjoint)
-	# 	elif fieldType == 'e_sec':
-	# 		return self._e_secDeriv(sol,tx,adjoint)
-	# 	elif fieldType == 'b':
-	# 		return self._bDeriv(sol,tx,adjoint)
-	# 	elif fieldType == 'b_sec':
-	# 		return self._b_secDeriv(sol,tx,adjoint)
-	# 	else:
-	# 		raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType)
-
-
-
-class FieldsFDEM_e(FieldsFDEM):
-	knownFields = {'e':'E'}
-	aliasFields = {
-					'b_sec' : ['e','F','_b_sec'],
-					'b' : ['b_sec','F','_b']
-				  }
-
-	def __init__(self,mesh,survey,**kwargs):
-		FieldsFDEM.__init__(self,mesh,survey,**kwargs)
-
-	def startup(self):
-		self.edgeCurl = self.survey.prob.mesh.edgeCurl
-		self.getSource = self.survey.prob.getSource
-		self.getSourceDeriv = self.survey.prob.getSourceDeriv 
-
 	def calcFields(self,sol,tx,fieldType):
 		if fieldType == 'e':
 			return self._e(sol,tx)
+		elif fieldType == 'e_sec':
+			return self._e_sec(sol,tx)
 		elif fieldType == 'b':
 			return self._b(sol,tx)
 		elif fieldType == 'b_sec':
@@ -61,6 +22,8 @@ class FieldsFDEM_e(FieldsFDEM):
 	def calcFieldsDeriv(self,sol,tx,fieldType,adjoint=False):
 		if fieldType == 'e':
 			return self._eDeriv(sol,tx,adjoint)
+		elif fieldType == 'e_sec':
+			return self._e_secDeriv(sol,tx,adjoint)
 		elif fieldType == 'b':
 			return self._bDeriv(sol,tx,adjoint)
 		elif fieldType == 'b_sec':
@@ -68,6 +31,23 @@ class FieldsFDEM_e(FieldsFDEM):
 		else:
 			raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType)
 
+
+
+class FieldsFDEM_e(FieldsFDEM):
+	knownFields = {'e':'E'}
+	aliasFields = {
+					'b_sec' : ['e','F','_b_sec'],
+					'b' : ['e','F','_b']
+				  }
+
+	def __init__(self,mesh,survey,**kwargs):
+		FieldsFDEM.__init__(self,mesh,survey,**kwargs)
+
+	def startup(self):
+		self.edgeCurl = self.survey.prob.mesh.edgeCurl
+		self.getSource = self.survey.prob.getSource
+		self.getSourceDeriv = self.survey.prob.getSourceDeriv 
+
 	def _e(self, e, tx):
 		return e
 
@@ -75,29 +55,37 @@ class FieldsFDEM_e(FieldsFDEM):
 		return None
 
 	def _b_sec(self, e, tx): #adjoint=False
-		iomegainv = 1./(1j*omega(tx.freq))
-		return -iomegainv * (self.edgeCurl * e)
+		return - 1./(1j*omega(tx.freq)) * (self.edgeCurl * e)
 
 	def _b_secDeriv(self, e, tx, adjoint=False): 
 		return None
 
-	def _b(self, b_sec, tx): #adjoint=False
+	def _b(self, e, tx): #adjoint=False
+		b = self._b_sec(e,tx)
+		print b.shape
 		j_m,_ = self.getSource(tx.freq)
-		return 1./(1j*omega(tx.freq)) + b_sec
+		if j_m[0] is not None:
+			b += 1./(1j*omega(tx.freq)) * np.array([j_m[0]]).T
+		return b
 
 	def _bDreiv(self, e, tx, adjoint=False):
 		j_mDeriv,_ = self.getSourceDeriv(tx.freq, adjoint)
-		if j_mDeriv is None:
+		b_secDeriv = self._b_secDeriv(e,tx.freq,adjoint)
+		if j_mDeriv is None & b_secDeriv is None:
 			return None
-		else:
+		elif b_secDeriv is None:
 			return 1./(1j*omega(tx.freq)) * j_mDeriv
+		elif j_mDeriv is None:
+			return b_secDeriv
+		else:
+			return 1./(1j*omega(tx.freq)) * j_mDeriv + b_secDeriv
 
 
 class FieldsFDEM_b(FieldsFDEM):
 	knownFields = {'b':'F'}
 	aliasFields = {
 					'e_sec' : ['b','E','_e_sec'],
-					'e' : ['e_sec','E','_e']
+					'e' : ['b','E','_e']
 				  }
 
 	def __init__(self,mesh,survey,**kwargs):
@@ -110,26 +98,6 @@ class FieldsFDEM_b(FieldsFDEM):
 		self.getSource = self.survey.prob.getSource
 		self.getSourceDeriv = self.survey.prob.getSourceDeriv 
 
-	def calcFields(self,sol,tx,fieldType):
-		if fieldType == 'e':
-			return self._e(sol,tx)
-		elif fieldType == 'e_sec':
-			return self._e_sec(sol,tx)
-		elif fieldType == 'b':
-			return self._b(sol,tx)
-		else:
-			raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType)
-
-	def calcFieldsDeriv(self,sol,tx,fieldType,adjoint=False):
-		if fieldType == 'e':
-			return self._eDeriv(sol,tx,adjoint)
-		elif fieldType == 'e_sec':
-			return self._e_secDeriv(sol,tx,adjoint)
-		elif fieldType == 'b':
-			return self._bDeriv(sol,tx,adjoint)
-		else:
-			raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType)
-
 	def _b(self, b, tx):
 		return b
 
@@ -142,13 +110,22 @@ class FieldsFDEM_b(FieldsFDEM):
 	def _e_secDeriv(self, b, tx, adjoint=False):
 		return None
 
-	def _e(self, e_sec, tx):
+	def _e(self, b, tx):
+		e = self._e_sec(b,tx)
 		_, j_g = self.getSource(tx.freq)
-		return e_s - j_g
+		if j_g[0] is not None:
+			e += -np.array([j_g[0]]).T
+		return e
 
 	def _eDeriv(self, b, tx, adjoint=False):
 		_,j_gDeriv = self.getSourceDeriv(tx.freq, adjoint)
-		if j_gDeriv is None:
+		e_secDeriv = self._e_secDeriv(b,tx,adjoint)
+
+		if j_gDeriv is None & e_secDeriv is None:
 			return None
+		elif e_secDeriv is None:
+			return -j_gDeriv
+		elif j_gDeriv is None:
+			return e_secDeriv
 		else:
-			return -j_gDeriv	
\ No newline at end of file
+			return e_secDeriv - j_gDeriv
\ No newline at end of file
diff --git a/simpegEM/Tests/test_FDEM.py b/simpegEM/Tests/test_FDEM.py
index b2476168..bd7bf803 100644
--- a/simpegEM/Tests/test_FDEM.py
+++ b/simpegEM/Tests/test_FDEM.py
@@ -3,6 +3,7 @@ from SimPEG import *
 import simpegEM as EM
 import sys
 from scipy.constants import mu_0
+import copy
 
 testDerivs = False
 testCrossCheck = True
@@ -129,8 +130,6 @@ def crossCheckTest(fdemType, comp):
     if verbose:
         print '  Problem 1 solved'
 
-    prb1.unpair
-
     if fdemType == 'e':
         prb2 = getProblem('b', comp)
     elif fdemType == 'b':
@@ -381,29 +380,29 @@ class FDEM_DerivTests(unittest.TestCase):
         if testEB:
             def test_EB_CrossCheck_exr_Eform(self):
                 self.assertTrue(crossCheckTest('e', 'exr'))
-            # def test_EB_CrossCheck_eyr_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'eyr'))
-            # def test_EB_CrossCheck_ezr_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'ezr'))
-            # def test_EB_CrossCheck_exi_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'exi'))
-            # def test_EB_CrossCheck_eyi_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'eyi'))
-            # def test_EB_CrossCheck_ezi_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'ezi'))
+            def test_EB_CrossCheck_eyr_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'eyr'))
+            def test_EB_CrossCheck_ezr_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'ezr'))
+            def test_EB_CrossCheck_exi_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'exi'))
+            def test_EB_CrossCheck_eyi_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'eyi'))
+            def test_EB_CrossCheck_ezi_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'ezi'))
 
-            # def test_EB_CrossCheck_bxr_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'bxr'))
-            # def test_EB_CrossCheck_byr_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'byr'))
-            # # def test_EB_CrossCheck_bzr_Eform(self):
-            # #     self.assertTrue(crossCheckTest('e', 'bzr')) # Doesn't make sense to test this for p-s approach
-            # def test_EB_CrossCheck_bxi_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'bxi'))
-            # def test_EB_CrossCheck_byi_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'byi'))
-            # def test_EB_CrossCheck_bzi_Eform(self):
-            #     self.assertTrue(crossCheckTest('e', 'bzi'))
+            def test_EB_CrossCheck_bxr_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'bxr'))
+            def test_EB_CrossCheck_byr_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'byr'))
+            def test_EB_CrossCheck_bzr_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'bzr')) # Doesn't make sense to test this for p-s approach
+            def test_EB_CrossCheck_bxi_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'bxi'))
+            def test_EB_CrossCheck_byi_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'byi'))
+            def test_EB_CrossCheck_bzi_Eform(self):
+                self.assertTrue(crossCheckTest('e', 'bzi'))
 
         if testHJ:
             def test_HJ_CrossCheck_jxr_Jform(self):