using existing config and other tweaks