Added better border data.