fixed R37 data
refactoring