changes for PUC integration