Few tweaks here and there … errrr ...