Merged kanada_def into kanada