few tweaks to collect/expand