Fixed drunk/turbo logic again