Some more tweaks to smoothen this out