Improved server change