query A modified