Updated Calendar Controller