Some modifications and additional notifications so that we get a minimum of activity