diminished API queries and reorganized