replace core_extended with calendar