Minor advancements towards TGP in internal