Last minute tweaking