[*] Improving a couple of implementations