Adding date and id
Merging conflicts