Fix the Surface Before You Build on It