Slight improvement based on feedback.