Added preperatory work for border fixes