Test Encroachment and Adjust

Test Encroachment and Adjust