refactoring 310314-2