Changed to use new server