ADD: Improved with dateFormatFromTemplate