refactored policies