Added automatic option for the date