tweaks to enable clustering