And with some more tweaks