Changed CPPI checks and AddNotify change