Added mark_component_nr. Doesn't work.