Third pass: all corrected
Third pass: query
To be checked