preparing better request handling