Switched from Date to Calendar

variables type changed