Added notification and restoring of previous values