date logic is better now