Updated server app