Removed checking if date is null