List.add refactoring, rf-visibility added,  bugfix