refactoring, identification system working