Last minute tweaks 0