added logic to have the calendar be current date