Changed the way we store date
Merging