Updated server 2