improved server functionality