upgrade to new server api