Working on border issue