refactoring 310314-1