refactoring 000.1