Added hidden option --just-ub