Adressed Neutron's comments