Some more adjustments to the temp indexing