Final tweaks for tonight