and more tweaking for speed