USe proper date api