Improvements for question 34.