Updated calendar and classes