Updated based on CEPT document