Calendar upgrade, less variables