Attempts at getting the borders right