#8 - minor current date improvement