Added changes for server, working with Daling.