Feature/ciinrd 1