Switched to using local waddell server