Make changes for PAC-rebase