LOBO01-0 big refactoring