changed to include query params