changes to accomodate being used in a CMS