@colemanw this is the main difference between yours & mine - I put the date handling in the BAO where it belongs