refactoring 310314-3