Changes for testing and submission.