added 'Y-day' + 'Today' support