Added border (for real this time)