refactor using full PAC now