changed the function layout, added better structure to the client Headers
Damn outdated documents