Added notification. Need to fix SecurityException