Enhancing the AM-25 for CC