TRAPDRIVE_CONTROL: changes for using marconi
mend