Last minute tweaks 1