generalize uba code to handle Q bus more gracefully