changes for gcal migration