Need to improve hoa.map