Added border
Border code commented out