refactoring 280314-1