Adding potential extracter, fixing diffusion extraction