moved enrichment stuff to a remark