refactoring for new policies