tweaks for code-only