Neck Server: initial changes