Added new server and modified Main