border fix- take 2