[CHORE] Modified server