Updated MacClient