More preparations for addition of diagnostic table showing which variables