a little more tweaking