ugh more tweaking