Slight overall improvements