Cleaned up
Finally solved the response bug