Further tweaks for tomorrow