Some more tweaks to make it better