Updated Front-end of Server