refactored HPGE out of TIP wall and modernized