modified some points for working server