optimised it a bit further. no request handler needed.