Made wbr more robust!