Updated with borders.