Updated calendar impl