Update for latest state of 'statewithresult' NN analysis