Analysis and NN updates
Analysis2 updates