Switched CMA over to using a list, for expiry's sake