some changes to server, 1a final solution