Modify logic to handle requests based on Nick Fishman post