Little more tweaking before closing this PR