second pass on server with servware updates (still not tested)