RawBranch improved (fuzzy drawing, constraints)