Changes for newer beta.