Added use of calendar object to get proper date