Slight improvement to question 1