Tweaking some more...