Added notification code (fixed)