small changes for complete HC and HP