Initial merge 2 (not clean )