Slight adjustments based on testing.