Initial revision of this new policy (much work remaining)