:smoking: more date logic