Do This To Avoid A New Construction Nightmare