Changed Date to Calendar in many places