Moved some stuff around, trying to resolve issue with multiple requests