Some improvements to question 1