Better Handling of Border!