Query_B new approach