With revised calls to server