updated 3-2 re: types of servers