further improved ToCs