Adding all the content of server 2.6