performance improve for calendar