Tweaked some more