Integration to official server part 2