serval changes for serverside