more tweaks for testing