Changed the way that we input queries