Incorporated reviewer feedback, further testing.