Added more things that only one server needs to do