Improving overall navigation and validation.