changed request handling a bit