improved server architecture