Little more tweaking