merged with rich
pulling from rich
Added the cms filter and merged with rich
errors