TC19930 and 31 along with supporting files