Improved hadoop-10641