Final update before Amazon submission.