Improvement on wbr!