Last changes for TGW