Just some more tweaking