Before CMS inclusion