drop dates logic attempt to fix