Blackhat-ready commit (fingers crossed!)