admintool refactor upload 6