More tqs custom changes