Working version for plain hadoop