added better initial queries