Changes required by TPA LC implemented