Updated CAP analysis