removed dependency on qwery