Tweaked logic