First pass, to be checked
Checked: corrected
Checked: query