Just a bit more tweaking