Add minor logic enh (may blow up)