merged HHunt changes