Feature/cel 198