gregory patches for border seems to work now