Updated with Query9