updated

Main.java changes code
Query.java more queries