Tweaked it yet again