Policy improvements

TOP