Possibly fixup god conduct code

This might be the right logic? Ah, what a mess...