updated neutron - not quite ready