Slight improvement to the last example