// right now the current removal works. Here I add the update as soon as it is needed!