Add units (MHz) and make Trap_Drive work