Tweaking it some more