Added Query, Some Reformatting