logic
adding date logic
merged