A few tweaks - rethinking underlying logic again.