added changes for servercode