Dig some more data from CHR + some tweaks