Changed stuff
Fixed merge conflicts
Check for content length