refactoring anc changes in quick registration