little changes for server