Changed most of use of Date to Calendar