Upwind method included. At this point this accurately reproduces Motoki's model.