removed use of Calendar