changed all the variable names
added queries