Added a second version with borders