Correction of the bug after the refactor and add of the delete tracking part