added query param stuff