removed angular, added query, YEAH