Updated to new cBorder