Initial changes for G525