Replaced usage of calendar on date usage