Improved answer for q1