more tweaking and not being so dumb