Updated SNAE and ODE