Feature/crp 43