adjusted to new request analyzer