refactoring 300314-1