Changes to accomodate new nan.