Feature/dev fact 7