Tweaked a whole lot more