re-organized policy handling