Daploader merge

Should work this way.