readd drop dates logic