migrate guideline away, and integrated guideline changes