CFK-92 replacing udb logic with just dates