Deleting no_date version since it causes problems for compilation. Date version revised