Updated to new Neuron class