merging with eldafani