even more tweaking