Updated to rev 859 + no 2nd notification