All done
Now need to resolve some cases, like pump off condition and so on...