new border and other changes