fixes some of the requesting logic