[CHANGE] border system