starting to fix the request management