changed to new server handle