Updated calendar override after upgrade