Feature/corporative2