improved suite_mode driver replacement