Merge some stuff...
Ddone