Updated policies, mostly from CM