Made adjustments based on QA tests.