Tweaking some more