Updated rtwo to support change from quantum-->neutron