Initial changes from WGLC.