added calculation of deletion dates