more tweaks for initial delivery