final tweaks for final