Made things a little more robust, and added initial notification.